From 477fc9565532263c499227fa1cccc72ec18d729d Mon Sep 17 00:00:00 2001
From: Daniel Boles <dboles@src.gnome.org>
Date: Mon, 28 Aug 2017 20:26:48 +0100
Subject: [PATCH] Entry: Only open emoji picker on 2ndary icon click

We hijack the secondary icon for the emoji picker, but the handler for
::icon-press did not check the pressed icon and opened it for either.

https://bugzilla.gnome.org/show_bug.cgi?id=786938
---
 gtk/gtkentry.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 26fd08dc28..840a9cbdc5 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -9858,7 +9858,8 @@ pick_emoji (GtkEntry *entry,
             GdkEvent *event,
             gpointer  data)
 {
-  gtk_entry_choose_emoji (entry);
+  if (icon == GTK_ENTRY_ICON_SECONDARY)
+    gtk_entry_choose_emoji (entry);
 }
 
 static void
-- 
2.30.2